Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 22 Mar 2010 10:47:09 +0000 (10:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 22 Mar 2010 10:47:09 +0000 (10:47 +0000)

Trivial merge